From 6308581f79fe5ca137753633ca9830066164459d Mon Sep 17 00:00:00 2001 From: robertl Date: Mon, 25 Jul 2005 22:50:18 +0000 Subject: [PATCH] Minor code hygeine fixes. (Remove unused vars, etc.) git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@1308 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/internal_styles.c | 83 +++++++++++++++++++++++++++++++++++++- gpsbabel/trackfilter.c | 4 +- gpsbabel/vitosmt.c | 10 ----- 3 files changed, 82 insertions(+), 15 deletions(-) diff --git a/gpsbabel/internal_styles.c b/gpsbabel/internal_styles.c index 706fbdace..fd42f49b6 100644 --- a/gpsbabel/internal_styles.c +++ b/gpsbabel/internal_styles.c @@ -212,6 +212,35 @@ static char gpsdrive[] = "OFIELD LON_DECIMAL, \"\", \"%08.5f\"\n" "OFIELD ICON_DESCR, \"\", \"%s\"\n" ; +static char gpsdrivetrack[] = +"# gpsbabel XCSV style file\n" +"#\n" +"# Format: GPSDriveTrack\n" +"# Author: Tobias Minich\n" +"# Date: 12/07/2005\n" +"#\n" +"# \n" +"#\n" + +"DESCRIPTION GpsDrive Format for Tracks\n" + +"# FILE LAYOUT DEFINITIIONS:\n" +"#\n" +"FIELD_DELIMITER WHITESPACE\n" +"RECORD_DELIMITER NEWLINE\n" +"BADCHARS ,'\"\n" + +"SHORTLEN 20\n" +"SHORTWHITE 0\n" + +"#\n" +"# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n" + +"OFIELD LAT_DECIMAL, \"\", \"%10.6f\"\n" +"OFIELD LON_DECIMAL, \"\", \"%10.6f\"\n" +"OFIELD ALT_METERS, \"\", \"%10.0f\"\n" +"OFIELD GMT_TIME, \"\", \"%a %b %d %T %Y\"\n" +; static char gpsman[] = "# gpsbabel XCSV style file\n" "#\n" @@ -373,6 +402,56 @@ static char nima[] = "IFIELD DESCRIPTION, \"\", \"%s\" # FULL_NAME_ND\n" "IFIELD IGNORE, \"\", \"%s\" # MODIFY_DATE\n" ; +static char openoffice[] = +"# gpsbabel XCSV style file\n" +"#\n" +"# Format: Tab delimitered csv useful for OpenOffice, Ploticus etc.\n" +"# Author: Tobias Minich\n" +"# Date: 07/18/2005\n" +"#\n" +"#\n" + +"DESCRIPTION Custom \"Everything\" Style\n" + +"# FILE LAYOUT DEFINITIIONS:\n" +"#\n" +"FIELD_DELIMITER TAB\n" +"RECORD_DELIMITER NEWLINE\n" +"BADCHARS TAB\n" +"FORMAT_TYPE INTERNAL\n" + +"#\n" +"# HEADER STUFF:\n" +"#\n" +"PROLOGUE Index Lat Lon Icon Name Description Notes URL Link Text Altitude (m) Distance (km) Speed (m/s) Course (°) Time HDOP VDOP PDOP Satellites Fix\n" + +"#\n" +"# INDIVIDUAL DATA FIELDS:\n" +"#\n" +"IFIELD INDEX, \"\", \"%d\"\n" +"IFIELD LAT_DECIMAL, \"\", \"%f\"\n" +"IFIELD LAT_DIR, \"\", \"%c\"\n" +"IFIELD LAT_HUMAN_READABLE, \"\", \"%d° %f' %c\"\n" +"IFIELD LON_DECIMAL, \"\", \"%f\"\n" +"IFIELD LON_DIR, \"\", \"%c\"\n" +"IFIELD LON_HUMAN_READABLE, \"\", \"%d° %f' %c\"\n" +"IFIELD ICON_DESCR, \"\", \"%s\"\n" +"IFIELD SHORTNAME, \"\", \"%s\"\n" +"IFIELD DESCRIPTION, \"\", \"%s\"\n" +"IFIELD NOTES, \"\", \"%s\"\n" +"IFIELD URL, \"\", \"%s\" \n" +"IFIELD URL_LINK_TEXT, \"\", \"%s\"\n" +"IFIELD ALT_METERS, \"\", \"%f\"\n" +"IFIELD PATH_DISTANCE_KM, \"\", \"%f\"\n" +"IFIELD PATH_SPEED, \"\", \"%f\"\n" +"IFIELD PATH_COURSE, \"\", \"%f\"\n" +"IFIELD EXCEL_TIME, \"\", \"%f\"\n" +"IFIELD GPS_HDOP, \"\", \"%f\"\n" +"IFIELD GPS_VDOP, \"\", \"%f\"\n" +"IFIELD GPS_PDOP, \"\", \"%f\"\n" +"IFIELD GPS_SAT, \"\", \"%d\"\n" +"IFIELD GPS_FIX, \"\", \"%s\"\n" +; static char s_and_t[] = "# gpsbabel XCSV style file\n" "#\n" @@ -570,5 +649,5 @@ static char xmapwpt[] = "IFIELD DESCRIPTION, \"\", \"%-.78s\"\n" ; #include "defs.h" -style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap", xmap } , { "tabsep", tabsep } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "nima", nima } , { "mxf", mxf } , { "mapconverter", mapconverter } , { "gpsman", gpsman } , { "gpsdrive", gpsdrive } , { "fugawi", fugawi } , { "dna", dna } , { "custom", custom } , { "csv", csv } , { "arc", arc } , {0,0}}; -size_t nstyles = 15; +style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap", xmap } , { "tabsep", tabsep } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "openoffice", openoffice } , { "nima", nima } , { "mxf", mxf } , { "mapconverter", mapconverter } , { "gpsman", gpsman } , { "gpsdrivetrack", gpsdrivetrack } , { "gpsdrive", gpsdrive } , { "fugawi", fugawi } , { "dna", dna } , { "custom", custom } , { "csv", csv } , { "arc", arc } , {0,0}}; +size_t nstyles = 17; diff --git a/gpsbabel/trackfilter.c b/gpsbabel/trackfilter.c index f82d76809..8af2d2512 100644 --- a/gpsbabel/trackfilter.c +++ b/gpsbabel/trackfilter.c @@ -161,7 +161,6 @@ trackfilter_split_init_rte_name(route_head *track, const time_t time) { char buff[128], tbuff[128]; struct tm tm; - size_t tlen; tm = *localtime(&time); @@ -201,7 +200,7 @@ trackfilter_split_init_rte_name(route_head *track, const time_t time) void trackfilter_pack_init_rte_name(route_head *track, const time_t time) { - char buff[128], tbuff[128]; + char tbuff[128]; struct tm tm; tm = *localtime(&time); @@ -222,7 +221,6 @@ static void trackfilter_pack(void) { int i, j, ct; - char tbuff[128]; route_head *master, *curr; queue *elem, *tmp; waypoint *wpt; diff --git a/gpsbabel/vitosmt.c b/gpsbabel/vitosmt.c index e8d4878b8..f7e1ad555 100644 --- a/gpsbabel/vitosmt.c +++ b/gpsbabel/vitosmt.c @@ -70,13 +70,6 @@ ReadRecord(FILE * f, return result; } -static void -Skip(FILE * f, - size_t distance) -{ - fseek(f, distance, SEEK_CUR); -} - static void WriteDouble(void* ptr, double d) { @@ -109,7 +102,6 @@ vitosmt_read(void) long check1 =-1; long check2 =-2; long check3 =-3; - unsigned short stringlen =0; route_head *route_head =0; waypoint *wpt_tmp =0; double latrad =0; @@ -125,7 +117,6 @@ vitosmt_read(void) unsigned char gpsvalid =0; unsigned char gpssats =0; int serial =0; - char buffer[80] ="\0"; /* @@ -274,7 +265,6 @@ vitosmt_waypt_pr(const waypoint *waypointp) size_t position =0; struct tm* tmstructp =0; double seconds =0; - double worknum =0; ++count; workbuffer = xcalloc(vitosmt_datasize,1); -- 2.30.2